Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 11 Jun 2010 12:14:41 +0000 (12:14 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 11 Jun 2010 12:14:41 +0000 (12:14 +0000)

Trivial merge